diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index a8deb9f..b5e7d9d 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -34,6 +34,7 @@
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
 TARGET_USE_PAN_DISPLAY := true
 
+TARGET_USES_HWC2 := true
 SF_START_GRAPHICS_ALLOCATOR_SERVICE := true
 
 TARGET_AUX_OS_VARIANT_LIST := neonkey argonkey
diff --git a/device-common.mk b/device-common.mk
index d3476b5..21959b5 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -58,6 +58,7 @@
 # Graphics HAL
 PRODUCT_PACKAGES += \
     android.hardware.graphics.allocator@2.0-impl \
+    android.hardware.graphics.composer@2.1-impl \
     android.hardware.graphics.mapper@2.0-impl
 
 # Memtrack
diff --git a/manifest.xml b/manifest.xml
index 1cb36ab..0c354d2 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -18,6 +18,15 @@
         </interface>
     </hal>
     <hal format="hidl">
+        <name>android.hardware.graphics.composer</name>
+        <transport arch="32+64">passthrough</transport>
+        <version>2.1</version>
+        <interface>
+            <name>IComposer</name>
+            <instance>default</instance>
+        </interface>
+    </hal>
+    <hal format="hidl">
         <name>android.hardware.graphics.mapper</name>
         <transport arch="32+64">passthrough</transport>
         <version>2.0</version>